Merge branch 'master' into native-layout
authorJohannes Schmid <jhs@gnome.org>
Mon, 14 Dec 2009 14:36:22 +0000 (15:36 +0100)
committerJohannes Schmid <jhs@gnome.org>
Mon, 14 Dec 2009 14:36:22 +0000 (15:36 +0100)
1  2 
gtk/gtk.symbols
gtk/gtkwidget.c

diff --cc gtk/gtk.symbols
Simple merge
diff --cc gtk/gtkwidget.c
Simple merge